auto merge of #162 : rust-lang/cargo/fix-travis, r=tinyfix
authorbors <bors@rust-lang.org>
Thu, 10 Jul 2014 21:51:51 +0000 (21:51 +0000)
committerbors <bors@rust-lang.org>
Thu, 10 Jul 2014 21:51:51 +0000 (21:51 +0000)

Trivial merge